Shell Geometry Management

<#5275#> <#5276#>